Skip to content

Conversation

petrochenkov
Copy link
Contributor

With the intent of using it in UI tests (#67122).

The option is boolean (-Z deduplicate-diagnostics=yes/no) and can be specified multiple times with later values overriding earlier values (-Z deduplicate-diagnostics=no -Z deduplicate-diagnostics=yes == -Z deduplicate-diagnostics=yes), so it can be set in a hierarchical way, e.g. UI testing infra may disable the deduplication by default with specific tests being able to enable it back.

@petrochenkov petrochenkov added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 30, 2019
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Dec 31, 2019
Support `-Z ui-testing=yes/no`

`ui-testing` is now a boolean option (`-Z ui-testing=yes/no`) and can be specified multiple times with later values overriding earlier values (`-Z ui-testing=yes -Z ui-testing=no` == `-Z ui-testing=no`), so it can be set in a hierarchical way, e.g. UI testing infra may enable it by default with specific tests being able to opt-out.

This way we can remove the special opt-out support from `compiletest`.

Inspired by rust-lang#67709.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Dec 31, 2019
Support `-Z ui-testing=yes/no`

`ui-testing` is now a boolean option (`-Z ui-testing=yes/no`) and can be specified multiple times with later values overriding earlier values (`-Z ui-testing=yes -Z ui-testing=no` == `-Z ui-testing=no`), so it can be set in a hierarchical way, e.g. UI testing infra may enable it by default with specific tests being able to opt-out.

This way we can remove the special opt-out support from `compiletest`.

Inspired by rust-lang#67709.
@bors
Copy link
Collaborator

bors commented Dec 31, 2019

☔ The latest upstream changes (presumably #67752) made this pull request unmergeable. Please resolve the merge conflicts.

@cramertj
Copy link
Member

cramertj commented Jan 2, 2020

r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned cramertj Jan 2, 2020
Copy link
Contributor

@Centril Centril left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with rebase & comment adjusted.

@petrochenkov
Copy link
Contributor Author

@bors r=Centril

@bors
Copy link
Collaborator

bors commented Jan 3, 2020

📌 Commit 5bf8105 has been approved by Centril

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 3, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 4, 2020
Introduce an option for disabling deduplication of diagnostics

With the intent of using it in UI tests (rust-lang#67122).

The option is boolean (`-Z deduplicate-diagnostics=yes/no`) and can be specified multiple times with later values overriding earlier values (`-Z deduplicate-diagnostics=no -Z deduplicate-diagnostics=yes` == `-Z deduplicate-diagnostics=yes`), so it can be set in a hierarchical way, e.g. UI testing infra may disable the deduplication by default with specific tests being able to enable it back.
bors added a commit that referenced this pull request Jan 4, 2020
Rollup of 4 pull requests

Successful merges:

 - #67137 (libstd uses `core::panic::Location` where possible.)
 - #67709 (Introduce an option for disabling deduplication of diagnostics)
 - #67775 (Make "use $crate" a hard error)
 - #67812 (Tweak and extend internal BTreeMap documentation, including debug asserts.)

Failed merges:

r? @ghost
@bors bors merged commit 5bf8105 into rust-lang:master Jan 4, 2020
@petrochenkov petrochenkov deleted the nodedup2 branch February 22, 2025 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants